From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Jun 2011 21:19:55 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3436^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=550c6a2507810730f9720c7a708c3dc47d109db1;p=emacs.git

Merge from trunk.
---

550c6a2507810730f9720c7a708c3dc47d109db1